From 4a58e751fba1bdca47389b2e0c42e24bd5f02965 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Thu, 17 Mar 2016 10:32:35 +0100 Subject: [PATCH] Adwaita: fix wide separators --- gtk/theme/Adwaita/_common.scss | 22 +++++++++++++--------- gtk/theme/Adwaita/gtk-contained-dark.css | 12 ++++++++---- gtk/theme/Adwaita/gtk-contained.css | 12 ++++++++---- 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index c84951e507..ef37f42af7 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -3719,25 +3719,25 @@ paned { -gtk-icon-source: none; // defeats the ugly default handle decoration border-style: none; // just to be sure background-color: transparent; - // using background istead of a border since the border will get rendered twice (?) - background-image: linear-gradient(to top, $borders_color); + // workaround, using background istead of a border since the border will get rendered twice (?) + background-image: image($borders_color); background-size: 1px 1px; - &:selected { background-image: linear-gradient(to top, $selected_bg_color); } // FIXME is this needed? + &:selected { background-image: image($selected_bg_color); } // FIXME is this needed? - &:backdrop { background-image: linear-gradient(to top, $backdrop_borders_color); } + &:backdrop { background-image: image($backdrop_borders_color); } &.wide { - margin: 0; - padding: 0; min-width: 5px; min-height: 5px; - background-image: linear-gradient(to top, $borders_color), linear-gradient(to top, $borders_color); + background-color: $bg_color; + background-image: image($borders_color), image($borders_color); background-size: 1px 1px, 1px 1px; &:backdrop { - background-image: linear-gradient(to top, $backdrop_borders_color), - linear-gradient(to top, $backdrop_borders_color); + background-color: $backdrop_bg_color; + background-image: image($backdrop_borders_color), + image($backdrop_borders_color); } } } @@ -3757,6 +3757,8 @@ paned { } &.wide { + margin: 0; + padding: 0; background-repeat: repeat-y, repeat-y; background-position: left, right; } @@ -3769,6 +3771,8 @@ paned { background-position: top; &.wide { + margin: 0; + padding: 0; background-repeat: repeat-x, repeat-x; background-position: bottom, top; } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 9d96821ed6..558f3d9491 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -3750,14 +3750,14 @@ paned > separator { paned > separator:backdrop { background-image: linear-gradient(to top, #1f2222); } paned > separator.wide { - margin: 0; - padding: 0; min-width: 5px; min-height: 5px; - background-image: linear-gradient(to top, #1c1f1f), linear-gradient(to top, #1c1f1f); + background-color: #393f3f; + background-image: image(#1c1f1f), image(#1c1f1f); background-size: 1px 1px, 1px 1px; } paned > separator.wide:backdrop { - background-image: linear-gradient(to top, #1f2222), linear-gradient(to top, #1f2222); } + background-color: #393f3f; + background-image: image(#1f2222), image(#1f2222); } paned.horizontal > separator { background-repeat: repeat-y; } paned.horizontal > separator:dir(ltr) { @@ -3769,6 +3769,8 @@ paned.horizontal > separator { padding: 0 0 0 8px; background-position: right; } paned.horizontal > separator.wide { + margin: 0; + padding: 0; background-repeat: repeat-y, repeat-y; background-position: left, right; } paned.vertical > separator { @@ -3777,6 +3779,8 @@ paned.vertical > separator { background-repeat: repeat-x; background-position: top; } paned.vertical > separator.wide { + margin: 0; + padding: 0; background-repeat: repeat-x, repeat-x; background-position: bottom, top; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 48c6ce4423..6d2153b05f 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -3778,14 +3778,14 @@ paned > separator { paned > separator:backdrop { background-image: linear-gradient(to top, #a5a5a1); } paned > separator.wide { - margin: 0; - padding: 0; min-width: 5px; min-height: 5px; - background-image: linear-gradient(to top, #9d9d99), linear-gradient(to top, #9d9d99); + background-color: #e8e8e7; + background-image: image(#9d9d99), image(#9d9d99); background-size: 1px 1px, 1px 1px; } paned > separator.wide:backdrop { - background-image: linear-gradient(to top, #a5a5a1), linear-gradient(to top, #a5a5a1); } + background-color: #e8e8e7; + background-image: image(#a5a5a1), image(#a5a5a1); } paned.horizontal > separator { background-repeat: repeat-y; } paned.horizontal > separator:dir(ltr) { @@ -3797,6 +3797,8 @@ paned.horizontal > separator { padding: 0 0 0 8px; background-position: right; } paned.horizontal > separator.wide { + margin: 0; + padding: 0; background-repeat: repeat-y, repeat-y; background-position: left, right; } paned.vertical > separator { @@ -3805,6 +3807,8 @@ paned.vertical > separator { background-repeat: repeat-x; background-position: top; } paned.vertical > separator.wide { + margin: 0; + padding: 0; background-repeat: repeat-x, repeat-x; background-position: bottom, top; } -- 2.30.2